Skip to content

Wire branch completion into git diff argument positions#228

Merged
lucieleblanc merged 3 commits into
mainfrom
app-3484/git-diff-branch-completion
Apr 3, 2026
Merged

Wire branch completion into git diff argument positions#228
lucieleblanc merged 3 commits into
mainfrom
app-3484/git-diff-branch-completion

Conversation

@lucieleblanc
Copy link
Copy Markdown
Contributor

Summary

Wire local_branches and remote_branches generators into git diff argument positions. Previously, git diff only suggested commits and changed/tracked files. Now it also suggests local and remote branch names in the completions dropdown.

Closes APP-3484

See also: GitHub #3805

What changed

In command-signatures/json/git.json, added local_branches and remote_branches to the git diff subcommand's args.generatorName array:

Before:

"generatorName": ["commits", "get_changed_or_tracked_files"]

After:

"generatorName": ["local_branches", "remote_branches", "commits", "get_changed_or_tracked_files"]

No new generators were needed — both local_branches and remote_branches already exist in git.rs and are used by other subcommands like checkout, log, and merge.

Screenshots

git diff completions showing branches, commits, and changed files:

git-diff-branch-completions


Conversation: https://staging.warp.dev/conversation/59758e67-03de-4ee3-b373-95bd8525be0d
Run: https://oz.staging.warp.dev/runs/019d4b03-015d-70cf-91b9-a644040c6da9

This PR was generated with Oz.

oz-agent added 2 commits April 1, 2026 22:05
Add local_branches and remote_branches generators to git diff's args,
so that branch names appear in the completions dropdown alongside
commits and changed files.

Closes APP-3484

Co-Authored-By: Oz <oz-agent@warp.dev>
Co-Authored-By: Oz <oz-agent@warp.dev>
@linear
Copy link
Copy Markdown

linear Bot commented Apr 1, 2026

APP-3484 [git] Wire branch completion into git diff argument positions

Wire branch completion generators (local_branches, remote_branches) into git diff . Currently this only suggests commits/SHAs.

See GitHub #3805

@lucieleblanc
Copy link
Copy Markdown
Contributor Author

Screenshot:
image

@lucieleblanc lucieleblanc marked this pull request as ready for review April 3, 2026 15:49
@lucieleblanc lucieleblanc merged commit e1bf282 into main Apr 3, 2026
3 checks passed
@lucieleblanc lucieleblanc deleted the app-3484/git-diff-branch-completion branch April 3, 2026 16:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants